Autogenerated HTML docs for v1.5.6.2-212-g08b5 
diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 03bcedf..d40203f 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html 
@@ -3,7 +3,7 @@  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">   <head>   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  -<meta name="generator" content="AsciiDoc 7.0.2" />  +<meta name="generator" content="AsciiDoc 8.2.5" />   <style type="text/css">   /* Debug borders */   p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {  @@ -16,8 +16,13 @@  margin: 1em 5% 1em 5%;   }    -a { color: blue; }  -a:visited { color: fuchsia; }  +a {  + color: blue;  + text-decoration: underline;  +}  +a:visited {  + color: fuchsia;  +}     em {   font-style: italic;  @@ -39,13 +44,18 @@  line-height: 1.3;   }    -h1 {  +h1, h2, h3 {   border-bottom: 2px solid silver;   }   h2 {  - border-bottom: 2px solid silver;   padding-top: 0.5em;   }  +h3 {  + float: left;  +}  +h3 + * {  + clear: left;  +}     div.sectionbody {   font-family: serif;  @@ -70,7 +80,7 @@  color: #527bbd;   font-family: sans-serif;   font-weight: bold;  - font-size: 1.2em;  + font-size: 1.1em;   }   span#email {   }  @@ -139,6 +149,9 @@  padding: 0.5em;   }    +div.listingblock {  + margin-right: 0%;  +}   div.listingblock > div.content {   border: 1px solid silver;   background: #f4f4f4;  @@ -148,9 +161,13 @@  div.quoteblock > div.content {   padding-left: 2.0em;   }  -div.quoteblock .attribution {  +  +div.attribution {   text-align: right;   }  +div.verseblock + div.attribution {  + text-align: left;  +}     div.admonitionblock .icon {   vertical-align: top;  @@ -194,13 +211,12 @@  ul, ol {   list-style-position: outside;   }  -ol.olist2 {  +div.olist2 ol {   list-style-type: lower-alpha;   }     div.tableblock > table {  - border-color: #527bbd;  - border-width: 3px;  + border: 3px solid #527bbd;   }   thead {   font-family: sans-serif;  @@ -214,6 +230,9 @@  margin-top: 0.8em;   margin-bottom: 0.8em;   }  +div.hlist td {  + padding-bottom: 5px;  +}   td.hlist1 {   vertical-align: top;   font-style: italic;  @@ -226,7 +245,33 @@  @media print {   div#footer-badges { display: none; }   }  -include::./stylesheets/xhtml11-manpage.css[]  +  +div#toctitle {  + color: #527bbd;  + font-family: sans-serif;  + font-size: 1.1em;  + font-weight: bold;  + margin-top: 1.0em;  + margin-bottom: 0.1em;  +}  +  +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {  + margin-top: 0;  + margin-bottom: 0;  +}  +div.toclevel2 {  + margin-left: 2em;  + font-size: 0.9em;  +}  +div.toclevel3 {  + margin-left: 4em;  + font-size: 0.9em;  +}  +div.toclevel4 {  + margin-left: 6em;  + font-size: 0.9em;  +}  +include1::./stylesheets/xhtml11-manpage.css[]   /* Workarounds for IE6's broken and incomplete CSS2. */     div.sidebar-content {  @@ -255,6 +300,9 @@  border-left: 2px solid silver;   padding-left: 0.5em;   }  +  +/* IE6 sets dynamically generated links as visited. */  +div#toc a:visited { color: blue; }   </style>   <title>git-merge-one-file(1)</title>   </head>  @@ -272,29 +320,29 @@  </div>   <h2>SYNOPSIS</h2>   <div class="sectionbody">  -<p><em>git-merge-one-file</em></p>  +<div class="para"><p><em>git-merge-one-file</em></p></div>   </div>  -<h2>DESCRIPTION</h2>  +<h2 id="_description">DESCRIPTION</h2>   <div class="sectionbody">  -<p>This is the standard helper program to use with <tt>git-merge-index</tt>  -to resolve a merge after the trivial merge done with <tt>git-read-tree -m</tt>.</p>  +<div class="para"><p>This is the standard helper program to use with <em>git-merge-index</em>  +to resolve a merge after the trivial merge done with <em>git-read-tree -m</em>.</p></div>   </div>  -<h2>Author</h2>  +<h2 id="_author">Author</h2>   <div class="sectionbody">  -<p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;,  -Junio C Hamano &lt;junkio@cox.net&gt; and Petr Baudis &lt;pasky@suse.cz&gt;.</p>  +<div class="para"><p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;,  +Junio C Hamano &lt;junkio@cox.net&gt; and Petr Baudis &lt;pasky@suse.cz&gt;.</p></div>   </div>  -<h2>Documentation</h2>  +<h2 id="_documentation">Documentation</h2>   <div class="sectionbody">  -<p>Documentation by David Greaves, Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>  +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>   </div>  -<h2>GIT</h2>  +<h2 id="_git">GIT</h2>   <div class="sectionbody">  -<p>Part of the <a href="git.html">git(1)</a> suite</p>  +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>   </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jul-2008 03:01:53 UTC  +Last updated 2008-07-06 05:16:54 UTC   </div>   </div>   </body>